From 367364a8e109c3ccb792f775115ff70f14b8812f Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 19:35:44 -0500 Subject: [PATCH] Fix deprecations for GtkIconInfo --- gtk/gtkcolorswatch.c | 2 +- gtk/gtkfilesystem.c | 2 +- gtk/gtkiconfactory.c | 2 +- gtk/gtkiconhelper.c | 2 +- gtk/gtkicontheme.c | 22 +++++++++++----------- gtk/gtknumerableicon.c | 2 +- gtk/gtkrecentmanager.c | 2 +- tests/testicontheme.c | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c index e33a3f601f..c6081d7907 100644 --- a/gtk/gtkcolorswatch.c +++ b/gtk/gtkcolorswatch.c @@ -228,7 +228,7 @@ swatch_draw (GtkWidget *widget, g_object_unref (pixbuf); } - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); } cairo_restore (cr); diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c index 05ab5a1ec2..553e007e08 100644 --- a/gtk/gtkfilesystem.c +++ b/gtk/gtkfilesystem.c @@ -1165,7 +1165,7 @@ get_pixbuf_from_gicon (GIcon *icon, return NULL; pixbuf = gtk_icon_info_load_icon (icon_info, error); - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); return pixbuf; } diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index a3bfea78b7..b40267335b 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -1569,7 +1569,7 @@ render_icon_name_pixbuf (GtkIconSource *icon_source, if (info) { tmp_pixbuf = gtk_icon_info_load_icon (info, &error); - gtk_icon_info_free (info); + g_object_unref (info); } else tmp_pixbuf = NULL; diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c index 37ba5811c8..58ae8a15db 100644 --- a/gtk/gtkiconhelper.c +++ b/gtk/gtkiconhelper.c @@ -263,7 +263,7 @@ ensure_pixbuf_for_icon_name_or_gicon (GtkIconHelper *self, self->priv->rendered_pixbuf = ensure_stated_icon_from_info (self, context, info); if (info) - gtk_icon_info_free (info); + g_object_unref (info); } static void diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 42e86a2ca6..73d8ba7d0f 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -1444,7 +1444,7 @@ ensure_lru_cache_space (GtkIconTheme *icon_theme) g_list_length (priv->info_cache_lru))); priv->info_cache_lru = g_list_delete_link (priv->info_cache_lru, l); - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); } } @@ -1465,7 +1465,7 @@ add_to_lru_cache (GtkIconTheme *icon_theme, ensure_lru_cache_space (icon_theme); /* prepend new info to LRU */ priv->info_cache_lru = g_list_prepend (priv->info_cache_lru, - gtk_icon_info_copy (icon_info)); + g_object_ref (icon_info)); } static void @@ -1500,7 +1500,7 @@ remove_from_lru_cache (GtkIconTheme *icon_theme, g_list_length (priv->info_cache_lru))); priv->info_cache_lru = g_list_remove (priv->info_cache_lru, icon_info); - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); } } @@ -1614,7 +1614,7 @@ choose_icon (GtkIconTheme *icon_theme, icon_info->key.size, icon_info->key.flags, g_hash_table_size (priv->info_cache))); - icon_info = gtk_icon_info_copy (icon_info); + icon_info = g_object_ref (icon_info); remove_from_lru_cache (icon_theme, icon_info); return icon_info; @@ -1937,7 +1937,7 @@ gtk_icon_theme_load_icon (GtkIconTheme *icon_theme, } pixbuf = gtk_icon_info_load_icon (icon_info, error); - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); return pixbuf; } @@ -3117,7 +3117,7 @@ gtk_icon_info_finalize (GObject *object) if (icon_info->loadable) g_object_unref (icon_info->loadable); - g_slist_free_full (icon_info->emblem_infos, (GDestroyNotify) gtk_icon_info_free); + g_slist_free_full (icon_info->emblem_infos, (GDestroyNotify) g_object_unref); if (icon_info->pixbuf) g_object_unref (icon_info->pixbuf); if (icon_info->cache_pixbuf) @@ -3509,7 +3509,7 @@ proxy_pixbuf_destroy (guchar *pixels, gpointer data) if (icon_theme != NULL) ensure_in_lru_cache (icon_theme, icon_info); - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); } /** @@ -3576,7 +3576,7 @@ gtk_icon_info_load_icon (GtkIconInfo *icon_info, gdk_pixbuf_get_height (icon_info->pixbuf), gdk_pixbuf_get_rowstride (icon_info->pixbuf), proxy_pixbuf_destroy, - gtk_icon_info_copy (icon_info)); + g_object_ref (icon_info)); return icon_info->proxy_pixbuf; } @@ -3738,7 +3738,7 @@ proxy_symbolic_pixbuf_destroy (guchar *pixels, gpointer data) if (icon_theme != NULL) ensure_in_lru_cache (icon_theme, icon_info); - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); } static GdkPixbuf * @@ -3757,7 +3757,7 @@ symbolic_cache_get_proxy (SymbolicPixbufCache *symbolic_cache, gdk_pixbuf_get_height (symbolic_cache->pixbuf), gdk_pixbuf_get_rowstride (symbolic_cache->pixbuf), proxy_symbolic_pixbuf_destroy, - gtk_icon_info_copy (icon_info)); + g_object_ref (icon_info)); return symbolic_cache->proxy_pixbuf; } @@ -4834,7 +4834,7 @@ _gtk_icon_theme_check_reload (GdkDisplay *display) * * Return value: (transfer full): a #GtkIconInfo structure containing * information about the icon, or %NULL if the icon - * wasn't found. Free with gtk_icon_info_free() + * wasn't found. Unref with g_object_unref() * * Since: 2.14 */ diff --git a/gtk/gtknumerableicon.c b/gtk/gtknumerableicon.c index a1131f576e..e46547174a 100644 --- a/gtk/gtknumerableicon.c +++ b/gtk/gtknumerableicon.c @@ -215,7 +215,7 @@ draw_from_gicon (GtkNumerableIcon *self) return NULL; pixbuf = gtk_icon_info_load_icon (info, NULL); - gtk_icon_info_free (info); + g_object_unref (info); if (pixbuf == NULL) return NULL; diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c index 1c5a188232..310efe0771 100644 --- a/gtk/gtkrecentmanager.c +++ b/gtk/gtkrecentmanager.c @@ -1944,7 +1944,7 @@ get_icon_for_mime_type (const char *mime_type, return NULL; pixbuf = gtk_icon_info_load_icon (info, NULL); - gtk_icon_info_free (info); + g_object_unref (info); return pixbuf; } diff --git a/tests/testicontheme.c b/tests/testicontheme.c index bc0ee6959f..d294a47b34 100644 --- a/tests/testicontheme.c +++ b/tests/testicontheme.c @@ -231,7 +231,7 @@ main (int argc, char *argv[]) if (display_name) g_print ("Display name: %s\n", display_name); - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); } } else -- 2.30.2